Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Miri subtree update #117579

Merged
merged 24 commits into from
Nov 4, 2023
Merged

Miri subtree update #117579

merged 24 commits into from
Nov 4, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 4, 2023

r? @ghost

RalfJung and others added 24 commits October 27, 2023 11:52
@RalfJung
add aarch64-apple-darwin to list of supported targets
c2f232e
@bors
Auto merge of rust-lang#3144 - RalfJung:supported, r=oli-obk
5f3d81a 
add aarch64-apple-darwin to list of supported targets

I did not realize that aarch64-apple-darwin is a tier 2 target. We are testing it properly, even on rustc CI, so we might as well list it as fully supported here.
@RalfJung
data-race: preserve structured access information longer, and don't u…
052539e 
…pper-case access types
@RalfJung
give some more help for the unusual data races
278965a
Preparing for merge from rustc
e298453
Merge from rustc
d7e49c0
fmt
293501b
@bors
Auto merge of rust-lang#3147 - rust-lang:rustup-2023-10-28, r=saethlin
6212cc6 
Automatic Rustup
@RalfJung
atomic_op → atomic_rmw_op
0b6c30a
@RalfJung
consolidate and extend testing for _ patterns discarding the place
9b5b4dd
@RalfJung
add some tests specifically for validity checks arising from match bi…
d176900 
…nders
@bors
Auto merge of rust-lang#3148 - RalfJung:underscore-patterns, r=RalfJung
fb028cb 
Underscore pattern tests
@RalfJung
accept some atomic loads from read-only memory
bd81a58
@bors
Auto merge of rust-lang#3149 - RalfJung:atomic-readonly-loads, r=Ralf…
2c9baab 
…Jung

accept some atomic loads from read-only memory

matches rust-lang#115577
@RalfJung
make sure we catch UB with _ pattern in various syntactic positions
98eb384
@bors
Auto merge of rust-lang#3150 - RalfJung:undercore-match, r=RalfJung
de09bf5 
make sure we catch UB in match place even with _ pattern

Fixes rust-lang/miri#2360
Preparing for merge from rustc
4c3eb37
Merge from rustc
869827f
@bors
Auto merge of rust-lang#3153 - rust-lang:rustup-2023-11-02, r=RalfJung
1a08886 
Automatic Rustup
Preparing for merge from rustc
99417f2
Merge from rustc
fad8536
fmt
5b18703
@bors
Auto merge of rust-lang#3154 - rust-lang:rustup-2023-11-04, r=RalfJung
1b2e4a9 
Automatic Rustup
@bors
Auto merge of rust-lang#3145 - RalfJung:data-race-error, r=RalfJung
2ef639d 
give some more help for the unusual data races

Fixes rust-lang/miri#3142
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 4, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 4, 2023

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

RalfJung commented Nov 4, 2023

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 4, 2023

📌 Commit 2ef639d has been approved by RalfJung

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 4, 2023
@bors
Copy link
Contributor

bors commented Nov 4, 2023

⌛ Testing commit 2ef639d with merge 9c8a269...

@bors
Copy link
Contributor

bors commented Nov 4, 2023

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 9c8a269 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2023
@bors bors merged commit 9c8a269 into rust-lang:master Nov 4, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 4, 2023
@RalfJung RalfJung deleted the miri branch November 5, 2023 10:35
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9c8a269): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.9% [0.5%, 1.5%] 4
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.7% [-0.7%, -0.6%] 2
Improvements ✅
(secondary)		 -2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) 0.4% [-0.7%, 1.5%] 6

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.6% [0.6%, 0.6%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.5% [-0.6%, -0.5%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.0% [-0.6%, 0.6%] 4

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 635.521s -> 635.113s (-0.06%)
Artifact size: 304.34 MiB -> 304.36 MiB (0.01%)

@github-actions github-actions bot mentioned this pull request Nov 6, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 6, 2023
@bors-ferrocene @BenWiederhake
@SabrinaJewson @J-ZhengLi @koka831 @bjorn3 @joshlf @lengyijun @Zalathar @oli-obk @flip1995 @y21 @bors @bvanjoi
Merge #84
a01e81f 
84: Automated pull from upstream `master` r=Dajamante a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#117585
* rust-lang/rust#117576
* rust-lang/rust#96979
* rust-lang/rust#117191
* rust-lang/rust#117179
* rust-lang/rust#117574
* rust-lang/rust#117537
* rust-lang/rust#117608
  * rust-lang/rust#117596
  * rust-lang/rust#117588
  * rust-lang/rust#117524
  * rust-lang/rust#116017
* rust-lang/rust#117504
* rust-lang/rust#117469
* rust-lang/rust#116218
* rust-lang/rust#117589
* rust-lang/rust#117581
* rust-lang/rust#117503
* rust-lang/rust#117590
  * rust-lang/rust#117583
  * rust-lang/rust#117570
  * rust-lang/rust#117562
  * rust-lang/rust#117534
  * rust-lang/rust#116894
  * rust-lang/rust#110340
* rust-lang/rust#113343
* rust-lang/rust#117579
* rust-lang/rust#117094
* rust-lang/rust#117566
* rust-lang/rust#117564
  * rust-lang/rust#117554
  * rust-lang/rust#117550
  * rust-lang/rust#117343
* rust-lang/rust#115274
* rust-lang/rust#117540
* rust-lang/rust#116412
* rust-lang/rust#115333
* rust-lang/rust#117507
* rust-lang/rust#117538
  * rust-lang/rust#117533
  * rust-lang/rust#117523
  * rust-lang/rust#117520
  * rust-lang/rust#117505
  * rust-lang/rust#117434
* rust-lang/rust#117535
* rust-lang/rust#117510
* rust-lang/rust#116439
* rust-lang/rust#117508



Co-authored-by: Ben Wiederhake <[email protected]>
Co-authored-by: SabrinaJewson <[email protected]>
Co-authored-by: J-ZhengLi <[email protected]>
Co-authored-by: koka <[email protected]>
Co-authored-by: bjorn3 <[email protected]>
Co-authored-by: Joshua Liebow-Feeser <[email protected]>
Co-authored-by: lengyijun <[email protected]>
Co-authored-by: Zalathar <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: Philipp Krones <[email protected]>
Co-authored-by: y21 <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: bohan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.
4 participants
@RalfJung @rustbot @bors @rust-timer